Took out ASCII constants, changed one diagnostic print statement.