Clean data
Remove directories
Sanitize data
Update TODO list
Clarify methods