Improve RSpec descriptions & code