Started tidying up fitness functions