Cleanup UGGrid code

Ansgar Burchardtrequested to merge
feature/uggrid-cleanup into master

Non-functional changes to make the code a bit nicer to read.

Merge request reports