Aravind | #00 | Minor refactoring.