Cleanup code and add searches to get more specific places