fix and cleanup formatting
format