Move class method to class file. Corrected style for method names