More code cleanup. No function changes, I don't think/