cleanup
improved names of class constants