Minor aesthetic changes
Parsing of options moved to bin/cart