latest style updates before new tests