Pedantic style changes