Merge pull request #119 from ucsflibtopfstedt/master

codebase cleanup
Merge pull request #120 from ucsflibtopfstedt/master

code cleanup
Merge pull request #121 from ucsflibtopfstedt/master

please merge.