Refactor - Thanks @ozrior!