Small change to code structure