Filling out script
Clean-up