Refactor Tasks e Calendar