Clean up and fixed formatting