New "grid" sketch
Small clean-up