Dependency, and format tidying