Refactoring, first vertical checker.