Cleanup: Combine 'if' statements