Work towards nice documentation