Minor restructure/fix