Issue #3: Exported code to helpers

Moved some private controller code to their helpers.