I've started refactoring process.