Refactored values
Moved int into private interface