Aesthetic tweaks, file renames for issue #166