-- Some refactoring...