Changed order, some cleanups