Fixed: everything inside blocks and no logging