More minor code cleanup