Moving browse code out