formatter update
code cleanup