Not sure moving them to smaller methods will buy anything.. I mean the comments above each block seems to tell me what the block is about.