Cleans up code and comments
Merge branch 'dev'