cosmetics, refactoring