Split up complex methods to reduce complexith