Clean up code a bit
Add list task