Cleaned World.cpp, World.h and Main.cpp