formatting
code clean up