Small code cleanup
Small code cleanup