clean up, clearer logging