Simplify, use blocks everywhere