re #444 : Code cleanup