a little code cleanaup