Just cleaned up a few things