Refactor/Layout Autofixes #139

Job	Run time
test (ubuntu-latest, 2.7)	59s
test (ubuntu-latest, 3.0)	46s
test (ubuntu-latest, 3.1)	57s
test (ubuntu-latest, 3.2)	50s
test (macos-latest, 2.7)	2m 24s
test (macos-latest, 3.0)	1m 38s
test (macos-latest, 3.1)	1m 21s
test (macos-latest, 3.2)	1m 12s
test (windows-latest, 2.7)	6m 8s
test (windows-latest, 3.0)	5m 12s
test (windows-latest, 3.1)	5m 54s
test (windows-latest, 3.2)	6m 38s
test (ubuntu-latest, jruby-9.4)	9m 0s
test (ubuntu-latest, truffleruby-head)	8m 3s
	51m 2s

Provide feedback