Minor edits to comments; remove unused debugging code and import.