Stylistic changes and explicit typedefs