Style updates and such
Merge commit '217df651180857a50523dd6469f8b43489ea8a16'