reformat the code, -> better overview