ever so small changes and clean up