Whitespace/tabs cleanup