more small code cleanyup