cleaup, make class.