Made minor cosmetic adjustments/optimizations