MOAR BETTER
Cleanup + more awesomeness