Nitpicky code cleanup.

Small items that didn't functionally change anything... but better for sanity sake.