improving dependencies a bit