Did some clean-ups on Shotgun.java