Move smell class and sub class methods to class level