code formated
code cleaned