Trailing/Indent file tidy.
Restyles utils to be helpers. Moves helpers to modules.