Some cleaning, and variable defining.