cleaning up code!