Move definitions back to last section; fix line lengths