removed reduntant null checking where possible, clarified mcFind