Clean up comments and fix stray --> bug