Cleans up all the code
Merge branch 'feature/code-cleanup' into develop

* feature/code-cleanup:
  Cleans up all the code