Tidied up. Moved to JodaTime.