More work for branch search & Code cleaning