Changed CC settings and made a few methods static