Refactored Code Per Testing.