uh, made the thing a little nicer