Minor simplifications
Missing use breaks testing
Another potential privacy leak