Polished some things up