Some more minor code cleanup