small refactoring, more gap between errors