Moved code into VirtualSpace, deleted extra class, refactoring