Add comments and remove unused exception type