Small renaming and formatting.