Cleanup.
Styleguide: follow idioms