Stilistic fixes