Script addition

Some beautification changes..