Is this sentence correct?

Question

Quand j’avais emménagé dans mon nouvel appartement, je ne l’avais pas encore décoré. Après beaucoup d’effort, j’ai enfin réussi de le rendre en ordre.

Answer 1

Looks good to me... When I moved into my new appartment I still had not decorated it. After a lot of effort I finally got it in order. If that is what you are trying to say then I understood it; and the grammar looks correct. I have not taught French for 2 years, but I do still remember it.