refactor: cleanup try catch constructs