Make cosmetic fix to code structure