Tidied up dependencies.