Cleanup

Cleaning up the whole mod, readying Enviroment for rocking.