Some Client Code Cleanup