convert all blocks to typedefs, thanks @collindonnell for the suggestion!