Cleaned up loading of level