first pass at readability refactor
final aesthetic tweaks