Issues/2014 do not pass entity around

Closes #2014  

While I was on the other side of that argument, as Apple tends to put braces on new lines we should stick with that as our standard. 

I just checked the style guide on Github @irbrad, it says we put it on a new line, where are you seeing the brace on the same line? The only exception I see for same line is on `if` and `for` statements?