Refactor complex methods