Adds name on crumb sets
Cleans code