Refactored for the good