fixing mark's suggestion, removing comment and use find_by