pre-class commit 4/24, some reformatting of old things