Whitespace / Remove a couple of unneeded passes