cleaned up whitespaces part2