Prettier and other minor changes.