even more refactoring - errors