Making categories safe be adding cl preffix all over the place