Cleanup + close #51