Syntax fixes
More style and syntax fixes
Keep fixing code
Merge branch 'feature/code-cleanup' into develop