Initial refactor of mad libs