Clean code from FeatureContext

#176