code cleaned up
Moving mutants