improve layout, remove doctrees