Made block number public for debugging
Reformatting and import optimization