Good to see your second commit before some one ask to do those wrappings. Can you modify your if block as well ? See other if blocks in the same file. Use a space before opening curly braces where applicable.