Cleaned a couple of things up