#2 - Refactor static methods
#2 - Go after existing key