Added Delete world fuction
Cleaned up classes