REFACTOR: Combined IFs