re #33 - Major markup and style refactor