TO DO Refactoring