clear up a few more notices + minor whitespace changes