Do minor code cleanup