Breaking things up, adding variables, cleaning.