More style changes

Based on dscanner and ddox issues, mostly.