piddly changes, cleanup