Cleanup + doc

It is a bit more readable IMO.