[#80305450] smaller methods

breaking up the methods a little
so we can manage the code better