Minor cleanup
Switched argument handling to getopts