TimeTypes #167

- Cleaning etc