refactor app code
modify double format
refactor
resolve conflicts
delete log
Merge pull request #476 from jialinsun/master

refactor app code