Style changes and other nitpicks/improvements