Cleaned up a few minor things