I'm already refactoring it. It will be in other PR.