fixing logging id and removing comments