checked classes for coding conventions and changed them according to