Rocky tidy

In contrast to the last pull request the 2nd commit is just to tidy some code a little. 

I wanted to have the pull request be just the 2nd commit without the duplicated first commit from another pull request. Oh well. At least they are separate pull requests and the commits are separated.