Optimizations and comment fixes for Aiming demo