Addition of Utilities Class and Cleanup.