Cleanup + comments.