Uniqueness, coding style fix [ci skip]