Refactoring featurse for clarity