Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
I thought adding a line break after the declaration would make the code a little bit easier to read. I believe the Xcode compiler does not mind spaces or line breaks.