Proper formatting

Formatting was very inconsistent, now cleaned up.