+ js cleanup and print method consolidation