Refactor commands & clean imports