Function name cleanup.
Indentation cleanup.