#8 fix comments, remove unecessary try catch block