clean up Search.hs further