More beautification changes..