Kalyan,Bamdad Refactoring...