Made everything less class level