mostly formatting and comment removal
some autoformatting got carried away
Merge pull request #87 from ministryofjustice/mostly_formatting_and_comment_removal

mostly formatting and comment removal