Non-functional Code cleanup.