A little cleanup + documentation