Whitespaces cleanup