Revert "Minor changes to more than 1 file"

This reverts commit f5e5219d4d3fef0045a2445f13c1fdaefddfe351.