clean up, refomat