Small code improvements

 * Changed from array_search to in_array
 * CC

Change-Id: I0c94926b8f2303c8d9ba31595565e81a65c66423
Merge "Small code improvements"