Arguments instead of options
Fix endlines