0.1.1: Clearup blocks and var names.