Minor code structure change