Mass cleanup
Merge pull request #3 from Decad3nce/master

base update