Cleaned up some minor things