Reorganized with CodeMaid.
Implemented https://trello.com/c/OYIdlDgu