clean up
use new format