Add list and clean a bit.