Changed  to
Moved all functions to helpers
Moved all functions to helpers