Format clean up