Cleaned up some small things