Small code enchancement