cleaned up code a little bit and took out binding.pry