Final formatting

Cleaned up formatting