added 2 todos to refactor the code