did some cleanup, about to play with datepicker