Minor code restructure