Plurrrr

refactoring