code cleanup 
code formatting