code formattinbg
code cleanup