minor changes to fix violations