Got rid of the try and replaced with option. Also comments.