Did some refactoring of feature files