Whitespaces clean up