small naming and #find method