Code cleanup

Avoid one line if statements. They are error prone and hard to read. My suggestion is to always use brackets.