fix some formatting
revert policy 0043 - use OLD