Whitespace fixes
Begin implementing search
refactor some vars to be more descriptive