cleaned up Structure2Quality.java a bit