Cleanup
Merge pull request #2 from NeuralSpaz/master

Cleanup