remove pry call
minor refactoring
fix error with empty values in polymorphic associations