refactoring & cosmetics