Cleaned up some functions
Merge branch 'master' of github.com:smbmwin/baseprep