re #435 : Code cleanup