Slight refactor..