Formatting

Just tidying formatting and conventions.