Bug 18113 small code improvements

A few more small improvements to add.
http://bugs.mitk.org/show_bug.cgi?id=18113