Add braces for if statements, remove warnings-causing code

--HG--
branch : experimental