fix https://trello.com/c/vNWMtnZn
fix https://trello.com/c/nLqfZEhS
refactor code
Apply new task list