altered the operators, fixed lint errors