Inspection, clean-up and documentation. Some errors