cleanup and add time via float