Slight clarity improvements