Split too complex methods