build clean tasks
cleaner refactor