Clean up and better seperation.