SCF
refactoring: 'value' -> 'val'
removed unneeded includes