Refactord User helpers even more.