Some small code cleanup

Some small code cleanup