General cleanup + commenting