Refactor/Commant