Tidy a few things