Performing some cleanup.
Simplified the code more.