Breaking down implementer
Cleaning code