Controller function refactor

Purpose

The purpose of this PR is to fix #66

[x] This PR doesn't commit any keys, passwords, tokens, usernames, or other secrets.
[ ] I have read and understood the development best practices guidelines ( http://bit.ly/sef-best-practices )
[ ] My code follows the style guidelines of this project
[ ] I have performed a self-review of my own code
[ ] I have commented my code, particularly in hard-to-understand areas
[ ] I have made corresponding changes to the documentation

## Test environment ## Learning