Small code enhancment