improve search; unalign function declarations