ordering fix; cleanup