+ Optimized and cleaned up cylinder collision code