Updated Copyright
code formatting
Removed trailing endChoice in CBR as not needed