Small beautification changes