little bit error handling - ActiveRecord::RecordNotFound, code cleanup