clean ups
Removed requirement for block.h
Cleaned up