Refactoring for readability#7

larsbrubaker wants to merge 2 commits intojunmer:masterjunmer/clipper-lib:masterfrom

larsbrubaker:masterlarsbrubaker/clipper-lib:masterCopy head branch name to clipboard