Formatting

Mainly small fixes for formatting compliance.