formatting and cleaning up code
code cleanup