Shifts now populating real data. formatting cleanup.