Update CLI to adhere to POSIX