remove unneeded views and cleanup warnings from searches
some whitespace & indent fixes