Quality clean of Circuit.java