convert to newer require import style
convert to newer require import style
reformat all code