Quick cleanup, ready for merge of #59