polishd things up a bit