rearrange code, standardization