Tidying up the code a little