Fix gcc compile error, and some format/comments