@wip fixed some violations