Minor clean ups
cc macros added