Cleaned up time...