Clean code.
Merge pull request #180 from capacity4dev/176

Clean code from FeatureContext.