Cleaned up Environment.java

And associated tasks
More with cluster stuff