Formatting

Minor format changes, remove unnecessary blank lines