Cleaned up a few small things