Fix the missing IF
Merging style changes