Clean up code format