Started working on strict search
Strict search implemented
Improved readability