Refactored

- Updated to a more consistent format
- defined object in 'catch' and 'else' blocks which will help with
consistency & error handling
- Updated CBH
Updated CBH