Minor updates to code structure