styling / refactoring