made dependencies a bit more uniform