Small optimizations. Removed a bool here and there.