Refactored Goal spawn