finished commands refactor