minor changes with whitespaces in code