Refactoring and adding back if statements