correct whitespaces issues