Use Static Keys and clarify helper method names