cleanup, comments and proper date formatting