Change to arguments prefixed with hyphen
Added usage text
cleanup