Minor restructuring for nitpick reasons