[v7r0] Beautifying

Should be mergable is I didn't screw it up while rebasing.