Log Cleanup
some renaming