fixes for whitespaces