cleaning up code..