Your answers and the books answers are equivalent, but I much prefer your answers! Observe:

Book answers:

These answers can be re-grouped as:

The first group is given in general by and the second group is given by , where n is an integer. These are your answers.

Which is best? It doesn't matter! (But I like yours).