minor cs improvements