cleaned up logging
there shouldn't be merge conflicts, but if there are lmk