cleanup + documentation
documentation + cleanup