Code compacted a lot.