clean up and change to catstyle