More class clean up such as making properties private, renaming variables, etc. Make opening search results work!