move options outside of cli class