More style updates and some filler

Day Hack project expected tens of commits in a short period, like a
sprint on steroids