Parse app parameter if given
Avoid allowing app parameter per command
Inline constants
Use single variable
Remove comment