Deleted search class (was never used), added comments,  removed lots of bracket from one-line-if statements.