comments and cleanup