Got rid of booleans that did not matter.