Code refactored + TODO comment added.