Tailor fix:

Method has 32 code lines, but should have no more than 30.