Use int32_t instead of int and fixed another style issue.