A bit of clean-up
Messing with improved block/boundary action creation