Refactors main file to increase readability
Merge remote-tracking branch 'origin/develop' into develop