Testing and refactoring...