minor code cleanup
added support for data value on blocks