#93 misc cleanup