Some code cleanup
Restructure code some more and add date label