LUN-1260: small code clean-up