refactoring , cleaning , organizing