Core pr 5

Code clean up and streamlining dates.