feature #1607: Improve accounting style
(cherry picked from commit a244c5c60ff3d846f32c858eac9f4184c3ff6ef9)