Ensure no null or empty keys
Refactoring [1/2]
Rename method
Refactoring [2/2]