Cleaning up comments
React to options rename