refactoring, little cleanup