Pedantic changes here and there