Refactor a method again