Merge 2 if statements, style nits.