Renaming CLIENT_ID => APP_ID in configuration and shortening code lines