adjust white space
refactor: do not hard code AppID