cleanup
code comments
merge dev
revert merge
Merge branch 'dev'