Minor updates in code structure