Minor code improvement