Add Utils and Cleanup
Merge pull request #63 from tctcl/tjk_clean_up

Add Utils and Clean Up