Cleaned some small things up