repeated violation warning + tidy up

:zzz: