Cleaned up for google style guide compliance