Clean code from FeatureContext

#176 
WIP