refactor, add styling