Code Cleanup
Added SimpleDateTime with Tests