Clean up and reformatted