Finished effect refactor for individual classes.