#41 Some minor cleanup before replacing doc._blockchain