Polish accounting. Version until 0.70 are under cleanup.