Code Refactored.