Minor fixups and remove excess whitespace