Code cleanup ...