Rewrite

I missed the PR yesterday since I was in swedish, so I'd like to propose some changes about it.

Remi was okay with them, but I'd like your opinions as well.