Minor improvements

I've added some minor improvements, mainly for consistency reasons.