Catapult neatened up a bit