organize search control class and add comments