Small style fixes for consistency