Tidying up the source a little.