Refactoring

- removed some exception handling (using Try/Failure instead)