cleaning (refactoring)