cleaning up
code