optimized Model->find() calls, udpated code formatting