Do some minor cleanup and fixes. minor fixes and cleanups
Attach a file by drag & drop or click to upload
