Some clean up and formatting.