Function maintenance and cleaning
Merge pull request #108 from gmckercher/master

Function maintenance and cleaning