reformatting CLI stuff