Improve Daily Report code