No functional change - tidy up