Good hint, refactoring...