Refactor -o option to simplify code