Attempt #2 at formatting clean up