Added class/function comments and code cleanup
Merge branch 'develop' into feature/docs