Revert some commit parts
Some more whitespace fixes