Refactoring : Remove redundancy features