some more small changes (mostly formatting)