cleaning up code,