Refactor parametrics doodle