Minor refactor, updated cc method info and updated changelog