Changed the name of a reflexive argument p to self. Removed the whole marcher part.