- Still cleaning up variables names.