Slight refactur