Attempt to cleanup formatting