Polished some things a bit