Refactoring
Adding todo