Minor cleanup + commenting