Refactored repeating code by extract method
Merge branch 'master' of https://github.com/itgeorge/ACME-Spaceship