smal code cleanup