[CHORE] if else clean up
[CHORE] variable name cleanup