Address github comments.