DE2300: Some code cleanup.