Refinements, especially on the verse of the day view
Trying to clean up project