Prettier and other improvements