Slight code improvement