erb fixes and slight reformatting