some fix & code format prettify