Refactoring PiscesDynamic a bit