Cleanup formatting and names