Small refactor for fix bugs