refactor simple block and block WIP