more refactoring - ERRORS