Swatter swing code tightened up