Refactor options.cpp
Aesthetic changes
Added --orphan