Improving comments and removing expected exceptions