cleanup and add long options
2 files changed