Cleaning up, reformatting, adding PHPDocs, converting array syntax
Merge branch 'feature/CleanUp' into develop