Added comments to options form class
Clean up options class