refactored if statement
commit
merge