Simpler method names
Add documentation to the ToDo list
Introduce resource groups and refactor