OGM-208 Some documentation and naming improvements; Getting rid of some raw type warnings
OGM-208 Removing superfluous type parameter from Option class