Refactor....