TimeTypes #167

- Misc
TimeTypes #167

- Cleaning