FIX: address github comments