reformat code
orders changes
image changes