Swift Vengeance/Refactor