Improve gmupload code readability and style
Improve gmsync code readability and style