Slight CS and style fixes