sets option variable for all entities and cleans code
Merge pull request #174 from kamalpreetgrewal/master

sets option variable for all entities and cleans code