Refactored again
Merge branch 'master' of github.com:jorjahung/Airport