Print method refactored
Minor file cleanup