Mars cleanup

Will close #160.