should fix all minor violation fixes