Minor refactor, styling