General refactoring and cleanup#62

MungoG merged 2 commits intocppalliance:developcppalliance/capy:developfrom

MungoG:vf-developMungoG/capy:vf-developCopy head branch name to clipboard