Code cleanup
Merge pull request #264 from hpicgs/code_cleanup

Code cleanup