use blocks to improve codeclimate score

Brings CC up to 3.81