Feature/core improvements

Cleaning up style of core dependencies.