Refactor fitness again.