Cleaned up a couple of things