Slight cleanup of comments and debug code