Script cleaned up