Cleaned up code in TaskDataSource and ProjectDataSource