Commenting & optimizations