reformat, thinking about the best practice