refactored remaining keys