Cleaned up the Time classes.