Added script documentation, Better naming scheme