added shorter version of cmd line options
code cosmetics