tidy up naming
fixed time struct conversion error