Minor changes
Simplify tasks, cli and utility