Checkblock optimization, comments cleanup