code rule fixes