Tidying up

Making some changes here to compare to some other options.