Minor beautifications and forgotten code