code refactored

It's just a code clean up  which helps for readability and Maintenance.