removed try/catch blocks, code readability