Began reformatting to separate classes.