Refactor for more consistence