Code comments and cleanup