Removed debug printout; minor cleanup.