fixed methods
refactoring methods