Optimization #2

Optimization from lev76g @ AquaFlame.NET Forums