Combine option styles
Updated README
Cleanup
Add TODO item to README