Updated some of the comments. Refactored the behaviours beforeFind method to simplify it