concision and comment + exception handle update