Cleaning up in preparation for adding monads/looping
Change user script