Minor Nitpicks

Non-critical improvements.