Clean up whitespace
Tests: clean up whitespace