Ashish|#00|Refactoring some code