First round of changes

Just tidying up a few things.