do not hardcode inputValue type + renamed fields/variables for readability