Little cleanup before PR

Only form to be aligned in master branch with the pr in master-pr