quick styling & refactoring