Small refactor, replace static variable with two static methods