Refactoring
Refactored some methods out to the Space class