Client Code Cleanup