Minor refactoring of constants, added in additional null checks due to helper methods.