(issue #951) split code into separate lines