cleaning up code
wrapping up