Code Refactoring

Code Refactoring adn Tooltip added