cleaning up code
cleaning up code, fixing search bar