More small style changes