removed stray empty line
made default handling of options more compact