Formatting, comments, constants and the like

resolves #58