Some more mainly whitespace removal
Some more mainly whitespace removal