fix code layout
improve source format
fix comment