Cosmetics: using UperCamel for classes