Minor refactoring + cleanup
Add a definite DONE status for the UI