what was once a simple style update has started turning into a complete
refactor. stopping the style changes here and moving on to refactor