Small refactor, styling