first minor cleanup