Rename vars
Add try/catch