Refactoring error, should use tools...