[WIP] Cleanup block getValue & getContentData