Style & Dependency Fixes