Improving code quality of DataStructure