Polished things up a bit