Reorganized class block