Remove call to #p
Refactor