Clean up code, rename variables for display of pomodoro completion stuff
Add a TBD regarding removal of a header