Code style/linebreak changes