Style adjustments, moving around dependencies