Clean up imports in Logic.java
Rename string constants for output formatting
Merge branch 'quality_control'