Code cleanup on the shot validation path