Simple refactoring for CAS initializer
Merge pull request #722 from Tahi-project/cas-refactoring

Simple refactoring for CAS initializer