Final Code Cleanup & Testing before release