revamp
Some cleanup. enuf said
Merge pull request #1 from didimitrie/MegaCleanup

Mega cleanup