Stylistic changes/cleanup. Tab set to 2 spaces
Cleaned up search code. Much more organized now.