Added clean task
Better value api and method names