Cleanup + commenting.