fix style problems part 2