Refactors complex methods