Extra comments and cleanup