Refactoring few features.