Refactoring and inlining dependancies.