Clean code in main
Minor changes and add comments
Merge branch 'master' of https://github.com/johnny5550822/watermelon-CLI