parndt refactors