Cleaned a few things up before merging