Clean up
Merge pull request #29 from uCtrl/Cleanup_Code

Clean up