Remove println
Remove println
More consistent handling of option
Make return type consistent w/ options