Start adding formatted date output and continuing refactoring