Code cleanup
Fixed genesis block check