re - factoring. add && change column operations simplifications