reflect review comments of #115. #111