Cleanup orders

closes #119 closes #117