Some ctrlp optimization
Some reorg and removing the annoying c, r, o options for format options.