Some code cleanup…