refactoring

Being faced with the prospect of having to delve into old code to get it running against a new language version is one of the things developers try to avoid...