began comments and cleanup