Cleaning up indentation and format