refactor to remove ugly br's