Perform small code cleanup