aravind, mahendra | refactoring & handling 'non' cases