Optimized by removing member varaibles