Cleanup more whitespace