Issues/2014 do not pass entity around

Closes #2014  

The style guide puts the { on the same line after the method declaration.