Can't we get rid of this predefined CLIENT_ID and instead in the one place where it is used create a client first and then look up that client? This would make the code more portable.