Cleaned up changes
Cleanup
API cleanup
React to options