refactor
move property to local variable
add InputHFlex case