Turn variable private static final
More refactoring for clean code