more styling and refactoring