comments and cleanup commit