long instead of Integer && refactoring