Cleaned up ComponentSearch class; Updated docs