cleaned up some ordering