Tidying up a few bits, committing just in case I break stuff! :)