Refactoring, abstracted spawnpoints a bit