Cleaned up working client and address on view