reformat everything to have a better readability