Fix bug with last commit. Small tidy up.