Formatting, re-arranging FIXME comments