cleans up code (tabs), adds tha hooks to search part