comments and cleanup.