Cleanup + commenting