Cleanup + comments