o: remove exceptions, s: reorder, realign, rename code