Small refactor to #find_by_param!
Styling fixes