last commit of the night, just some tidying up