Refactoring still in process.