Break up some lines that were doing too much