Expand Keywords class is cleaned up.